]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
cleanup: Use consistent switch indentation
authorFlorian Müllner <fmuellner@gnome.org>
Fri, 1 Feb 2019 12:21:00 +0000 (13:21 +0100)
committerGeorges Basile Stavracas Neto <georges.stavracas@gmail.com>
Tue, 2 Jul 2019 12:17:46 +0000 (12:17 +0000)
We are currently inconsistent on whether case labels share the same
indentation level as the corresponding switch statement or not. gjs
goes with the default of no additional indentation, so go along with
that.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/608

15 files changed:
js/misc/systemActions.js
js/ui/altTab.js
js/ui/appDisplay.js
js/ui/audioDeviceSelection.js
js/ui/boxpointer.js
js/ui/components/telepathyClient.js
js/ui/dnd.js
js/ui/endSessionDialog.js
js/ui/iconGrid.js
js/ui/lookingGlass.js
js/ui/magnifier.js
js/ui/notificationDaemon.js
js/ui/popupMenu.js
js/ui/status/network.js
js/ui/windowManager.js

index d7f88375db47811f18a6c278ba8517ae24005cc3..1bc3eabe26b70996e1114265f56dc62ed9f61f8c 100644 (file)
@@ -284,24 +284,24 @@ const SystemActions = GObject.registerClass({
 
     activateAction(id) {
         switch (id) {
-            case POWER_OFF_ACTION_ID:
-                this.activatePowerOff();
-                break;
-            case LOCK_SCREEN_ACTION_ID:
-                this.activateLockScreen();
-                break;
-            case LOGOUT_ACTION_ID:
-                this.activateLogout();
-                break;
-            case SUSPEND_ACTION_ID:
-                this.activateSuspend();
-                break;
-            case SWITCH_USER_ACTION_ID:
-                this.activateSwitchUser();
-                break;
-            case LOCK_ORIENTATION_ACTION_ID:
-                this.activateLockOrientation();
-                break;
+        case POWER_OFF_ACTION_ID:
+            this.activatePowerOff();
+            break;
+        case LOCK_SCREEN_ACTION_ID:
+            this.activateLockScreen();
+            break;
+        case LOGOUT_ACTION_ID:
+            this.activateLogout();
+            break;
+        case SUSPEND_ACTION_ID:
+            this.activateSuspend();
+            break;
+        case SWITCH_USER_ACTION_ID:
+            this.activateSwitchUser();
+            break;
+        case LOCK_ORIENTATION_ACTION_ID:
+            this.activateLockOrientation();
+            break;
         }
     }
 
index 83e26cf8a420e309ac8796eada344305afdd714b..2e2f7282dce2fb73fb9c7e55d374be67404cfeec 100644 (file)
@@ -984,23 +984,23 @@ class WindowIcon extends St.BoxLayout {
         let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
 
         switch (mode) {
-            case AppIconMode.THUMBNAIL_ONLY:
-                size = WINDOW_PREVIEW_SIZE;
-                this._icon.add_actor(_createWindowClone(mutterWindow, size * scaleFactor));
-                break;
-
-            case AppIconMode.BOTH:
-                size = WINDOW_PREVIEW_SIZE;
-                this._icon.add_actor(_createWindowClone(mutterWindow, size * scaleFactor));
-
-                if (this.app)
-                    this._icon.add_actor(this._createAppIcon(this.app,
-                                                             APP_ICON_SIZE_SMALL));
-                break;
-
-            case AppIconMode.APP_ICON_ONLY:
-                size = APP_ICON_SIZE;
-                this._icon.add_actor(this._createAppIcon(this.app, size));
+        case AppIconMode.THUMBNAIL_ONLY:
+            size = WINDOW_PREVIEW_SIZE;
+            this._icon.add_actor(_createWindowClone(mutterWindow, size * scaleFactor));
+            break;
+
+        case AppIconMode.BOTH:
+            size = WINDOW_PREVIEW_SIZE;
+            this._icon.add_actor(_createWindowClone(mutterWindow, size * scaleFactor));
+
+            if (this.app)
+                this._icon.add_actor(this._createAppIcon(this.app,
+                                                         APP_ICON_SIZE_SMALL));
+            break;
+
+        case AppIconMode.APP_ICON_ONLY:
+            size = APP_ICON_SIZE;
+            this._icon.add_actor(this._createAppIcon(this.app, size));
         }
 
         this._icon.set_size(size * scaleFactor, size * scaleFactor);
index d24780d0e4d8d85cdc7768196dfa468c3b930b9e..680613025270ac22cf0798eb0449093c160455d3 100644 (file)
@@ -1331,22 +1331,22 @@ var AppFolderPopup = class AppFolderPopup {
         let direction;
         let isLtr = Clutter.get_default_text_direction() == Clutter.TextDirection.LTR;
         switch (event.get_key_symbol()) {
-            case Clutter.Down:
-                direction = St.DirectionType.TAB_FORWARD;
-                break;
-            case Clutter.Right:
-                direction = isLtr ? St.DirectionType.TAB_FORWARD :
+        case Clutter.Down:
+            direction = St.DirectionType.TAB_FORWARD;
+            break;
+        case Clutter.Right:
+            direction = isLtr ? St.DirectionType.TAB_FORWARD :
                                     St.DirectionType.TAB_BACKWARD;
-                break;
-            case Clutter.Up:
-                direction = St.DirectionType.TAB_BACKWARD;
-                break;
-            case Clutter.Left:
-                direction = isLtr ? St.DirectionType.TAB_BACKWARD :
+            break;
+        case Clutter.Up:
+            direction = St.DirectionType.TAB_BACKWARD;
+            break;
+        case Clutter.Left:
+            direction = isLtr ? St.DirectionType.TAB_BACKWARD :
                                     St.DirectionType.TAB_FORWARD;
-                break;
-            default:
-                return Clutter.EVENT_PROPAGATE;
+            break;
+        default:
+            return Clutter.EVENT_PROPAGATE;
         }
         return actor.navigate_focus(null, direction, false);
     }
index 55eeb2b6c263997889a00c18cffbf4d567dde600..8ee00025c0f546e1eb62b8c0d927600ee1954da8 100644 (file)
@@ -55,27 +55,27 @@ var AudioDeviceSelectionDialog = GObject.registerClass({
 
     _getDeviceLabel(device) {
         switch (device) {
-            case AudioDevice.HEADPHONES:
-                return _("Headphones");
-            case AudioDevice.HEADSET:
-                return _("Headset");
-            case AudioDevice.MICROPHONE:
-                return _("Microphone");
-            default:
-                return null;
+        case AudioDevice.HEADPHONES:
+            return _("Headphones");
+        case AudioDevice.HEADSET:
+            return _("Headset");
+        case AudioDevice.MICROPHONE:
+            return _("Microphone");
+        default:
+            return null;
         }
     }
 
     _getDeviceIcon(device) {
         switch (device) {
-            case AudioDevice.HEADPHONES:
-                return 'audio-headphones-symbolic';
-            case AudioDevice.HEADSET:
-                return 'audio-headset-symbolic';
-            case AudioDevice.MICROPHONE:
-                return 'audio-input-microphone-symbolic';
-            default:
-                return null;
+        case AudioDevice.HEADPHONES:
+            return 'audio-headphones-symbolic';
+        case AudioDevice.HEADSET:
+            return 'audio-headset-symbolic';
+        case AudioDevice.MICROPHONE:
+            return 'audio-input-microphone-symbolic';
+        default:
+            return null;
         }
     }
 
index a1b0870bf1a85de1ec07cdd376d7ad4723b2eec9..1edc3dd9e2cd167fbf4fb3a1386e41ab92bb5177 100644 (file)
@@ -90,18 +90,18 @@ var BoxPointer = GObject.registerClass({
 
         if (animate & PopupAnimation.SLIDE) {
             switch (this._arrowSide) {
-                case St.Side.TOP:
-                    this.translation_y = -rise;
-                    break;
-                case St.Side.BOTTOM:
-                    this.translation_y = rise;
-                    break;
-                case St.Side.LEFT:
-                    this.translation_x = -rise;
-                    break;
-                case St.Side.RIGHT:
-                    this.translation_x = rise;
-                    break;
+            case St.Side.TOP:
+                this.translation_y = -rise;
+                break;
+            case St.Side.BOTTOM:
+                this.translation_y = rise;
+                break;
+            case St.Side.LEFT:
+                this.translation_x = -rise;
+                break;
+            case St.Side.RIGHT:
+                this.translation_x = rise;
+                break;
             }
         }
 
@@ -130,18 +130,18 @@ var BoxPointer = GObject.registerClass({
 
         if (animate & PopupAnimation.SLIDE) {
             switch (this._arrowSide) {
-                case St.Side.TOP:
-                    translationY = rise;
-                    break;
-                case St.Side.BOTTOM:
-                    translationY = -rise;
-                    break;
-                case St.Side.LEFT:
-                    translationX = rise;
-                    break;
-                case St.Side.RIGHT:
-                    translationX = -rise;
-                    break;
+            case St.Side.TOP:
+                translationY = rise;
+                break;
+            case St.Side.BOTTOM:
+                translationY = -rise;
+                break;
+            case St.Side.LEFT:
+                translationX = rise;
+                break;
+            case St.Side.RIGHT:
+                translationX = -rise;
+                break;
             }
         }
 
@@ -220,18 +220,18 @@ var BoxPointer = GObject.registerClass({
         childBox.x2 = availWidth - borderWidth;
         childBox.y2 = availHeight - borderWidth;
         switch (this._arrowSide) {
-            case St.Side.TOP:
-                childBox.y1 += rise;
-                break;
-            case St.Side.BOTTOM:
-                childBox.y2 -= rise;
-                break;
-            case St.Side.LEFT:
-                childBox.x1 += rise;
-                break;
-            case St.Side.RIGHT:
-                childBox.x2 -= rise;
-                break;
+        case St.Side.TOP:
+            childBox.y1 += rise;
+            break;
+        case St.Side.BOTTOM:
+            childBox.y2 -= rise;
+            break;
+        case St.Side.LEFT:
+            childBox.x1 += rise;
+            break;
+        case St.Side.RIGHT:
+            childBox.x2 -= rise;
+            break;
         }
         this.bin.allocate(childBox, flags);
 
index 08fff1925085ccf5b8a8e8b820d662fa4d42f763..3f961aab08c8f8ca08343d4d93e9f59f10bd90b1 100644 (file)
@@ -360,28 +360,28 @@ var ChatSource = class extends MessageTray.Source {
         let presenceType = this._contact.get_presence_type();
 
         switch (presenceType) {
-            case Tp.ConnectionPresenceType.AVAILABLE:
-                iconName = 'user-available';
-                break;
-            case Tp.ConnectionPresenceType.BUSY:
-                iconName = 'user-busy';
-                break;
-            case Tp.ConnectionPresenceType.OFFLINE:
-                iconName = 'user-offline';
-                break;
-            case Tp.ConnectionPresenceType.HIDDEN:
-                iconName = 'user-invisible';
-                break;
-            case Tp.ConnectionPresenceType.AWAY:
-                iconName = 'user-away';
-                break;
-            case Tp.ConnectionPresenceType.EXTENDED_AWAY:
-                iconName = 'user-idle';
-                break;
-            default:
-                iconName = 'user-offline';
-       }
-       return new Gio.ThemedIcon({ name: iconName });
+        case Tp.ConnectionPresenceType.AVAILABLE:
+            iconName = 'user-available';
+            break;
+        case Tp.ConnectionPresenceType.BUSY:
+            iconName = 'user-busy';
+            break;
+        case Tp.ConnectionPresenceType.OFFLINE:
+            iconName = 'user-offline';
+            break;
+        case Tp.ConnectionPresenceType.HIDDEN:
+            iconName = 'user-invisible';
+            break;
+        case Tp.ConnectionPresenceType.AWAY:
+            iconName = 'user-away';
+            break;
+        case Tp.ConnectionPresenceType.EXTENDED_AWAY:
+            iconName = 'user-idle';
+            break;
+        default:
+            iconName = 'user-offline';
+        }
+        return new Gio.ThemedIcon({ name: iconName });
     }
 
     _updateAvatarIcon() {
index 3f533e9af56f0a67c944f1d9306422c02b21a56b..e53de0b44cf33b0be00c1a7e507134f25a2b16ae 100644 (file)
@@ -561,11 +561,11 @@ var _Draggable = class _Draggable {
             let dropFunc = dragMonitors[i].dragDrop;
             if (dropFunc)
                 switch (dropFunc(dropEvent)) {
-                    case DragDropResult.FAILURE:
-                    case DragDropResult.SUCCESS:
-                        return true;
-                    case DragDropResult.CONTINUE:
-                        continue;
+                case DragDropResult.FAILURE:
+                case DragDropResult.SUCCESS:
+                    return true;
+                case DragDropResult.CONTINUE:
+                    continue;
                 }
         }
 
index 1c6989b7194cde759afa539a784b1151d1fa6aa8..74797ae43a3f68d4deb52cfb588a8636a77146f4 100644 (file)
@@ -472,19 +472,19 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
         // Trigger the offline update as requested
         if (this._checkBox.actor.checked) {
             switch (signal) {
-                case "ConfirmedReboot":
-                    this._triggerOfflineUpdateReboot(callback);
-                    break;
-                case "ConfirmedShutdown":
-                    // To actually trigger the offline update, we need to
-                    // reboot to do the upgrade. When the upgrade is complete,
-                    // the computer will shut down automatically.
-                    signal = "ConfirmedReboot";
-                    this._triggerOfflineUpdateShutdown(callback);
-                    break;
-                default:
-                    callback();
-                    break;
+            case "ConfirmedReboot":
+                this._triggerOfflineUpdateReboot(callback);
+                break;
+            case "ConfirmedShutdown":
+                // To actually trigger the offline update, we need to
+                // reboot to do the upgrade. When the upgrade is complete,
+                // the computer will shut down automatically.
+                signal = "ConfirmedReboot";
+                this._triggerOfflineUpdateShutdown(callback);
+                break;
+            default:
+                callback();
+                break;
             }
         } else {
             this._triggerOfflineUpdateCancel(callback);
index 44ccf4dd75651ec3dba82d5adc00346817cc4863..2dfdf5f44ab64b46b2aaf5883d4d4b418147b240 100644 (file)
@@ -312,14 +312,14 @@ var IconGrid = GObject.registerClass({
 
         let leftEmptySpace;
         switch (this._xAlign) {
-            case St.Align.START:
-                leftEmptySpace = 0;
-                break;
-            case St.Align.MIDDLE:
-                leftEmptySpace = Math.floor((availWidth - usedWidth) / 2);
-                break;
-            case St.Align.END:
-                leftEmptySpace = availWidth - usedWidth;
+        case St.Align.START:
+            leftEmptySpace = 0;
+            break;
+        case St.Align.MIDDLE:
+            leftEmptySpace = Math.floor((availWidth - usedWidth) / 2);
+            break;
+        case St.Align.END:
+            leftEmptySpace = availWidth - usedWidth;
         }
 
         let animating = this._clonesAnimating.length > 0;
@@ -806,14 +806,14 @@ var PaginatedIconGrid = GObject.registerClass({
 
         let leftEmptySpace;
         switch (this._xAlign) {
-            case St.Align.START:
-                leftEmptySpace = 0;
-                break;
-            case St.Align.MIDDLE:
-                leftEmptySpace = Math.floor((availWidth - usedWidth) / 2);
-                break;
-            case St.Align.END:
-                leftEmptySpace = availWidth - usedWidth;
+        case St.Align.START:
+            leftEmptySpace = 0;
+            break;
+        case St.Align.MIDDLE:
+            leftEmptySpace = Math.floor((availWidth - usedWidth) / 2);
+            break;
+        case St.Align.END:
+            leftEmptySpace = availWidth - usedWidth;
         }
 
         let x = box.x1 + leftEmptySpace + this.leftPadding;
index e191b509e0fb0546816bb66a28e1d1a8be7565f3..980cdf84511360966a016293120452fe4224ca66 100644 (file)
@@ -688,17 +688,17 @@ var Extensions = class Extensions {
 
     _stateToString(extensionState) {
         switch (extensionState) {
-            case ExtensionSystem.ExtensionState.ENABLED:
-                return _("Enabled");
-            case ExtensionSystem.ExtensionState.DISABLED:
-            case ExtensionSystem.ExtensionState.INITIALIZED:
-                return _("Disabled");
-            case ExtensionSystem.ExtensionState.ERROR:
-                return _("Error");
-            case ExtensionSystem.ExtensionState.OUT_OF_DATE:
-                return _("Out of date");
-            case ExtensionSystem.ExtensionState.DOWNLOADING:
-                return _("Downloading");
+        case ExtensionSystem.ExtensionState.ENABLED:
+            return _("Enabled");
+        case ExtensionSystem.ExtensionState.DISABLED:
+        case ExtensionSystem.ExtensionState.INITIALIZED:
+            return _("Disabled");
+        case ExtensionSystem.ExtensionState.ERROR:
+            return _("Error");
+        case ExtensionSystem.ExtensionState.OUT_OF_DATE:
+            return _("Out of date");
+        case ExtensionSystem.ExtensionState.DOWNLOADING:
+            return _("Downloading");
         }
         return 'Unknown'; // Not translated, shouldn't appear
     }
index 9e857f1a255ffbb77c241af2d5cae893a3dc1944..14b73b17c72df1e847bf5e74ea48fd98def7ab65 100644 (file)
@@ -1099,21 +1099,21 @@ var ZoomRegion = class ZoomRegion {
      */
     setScreenPosition(inPosition) {
         switch (inPosition) {
-            case GDesktopEnums.MagnifierScreenPosition.FULL_SCREEN:
-                this.setFullScreenMode();
-                break;
-            case GDesktopEnums.MagnifierScreenPosition.TOP_HALF:
-                this.setTopHalf();
-                break;
-            case GDesktopEnums.MagnifierScreenPosition.BOTTOM_HALF:
-                this.setBottomHalf();
-                break;
-            case GDesktopEnums.MagnifierScreenPosition.LEFT_HALF:
-                this.setLeftHalf();
-                break;
-            case GDesktopEnums.MagnifierScreenPosition.RIGHT_HALF:
-                this.setRightHalf();
-                break;
+        case GDesktopEnums.MagnifierScreenPosition.FULL_SCREEN:
+            this.setFullScreenMode();
+            break;
+        case GDesktopEnums.MagnifierScreenPosition.TOP_HALF:
+            this.setTopHalf();
+            break;
+        case GDesktopEnums.MagnifierScreenPosition.BOTTOM_HALF:
+            this.setBottomHalf();
+            break;
+        case GDesktopEnums.MagnifierScreenPosition.LEFT_HALF:
+            this.setLeftHalf();
+            break;
+        case GDesktopEnums.MagnifierScreenPosition.RIGHT_HALF:
+            this.setRightHalf();
+            break;
         }
     }
 
index 05ebb00689cf57b304c9dd3efb7100c247f7e57a..77960725ec1c7836acc8f17df75a11f8aee9cd98 100644 (file)
@@ -76,13 +76,13 @@ var FdoNotificationDaemon = class FdoNotificationDaemon {
     _fallbackIconForNotificationData(hints) {
         let stockIcon;
         switch (hints.urgency) {
-            case Urgency.LOW:
-            case Urgency.NORMAL:
-                stockIcon = 'dialog-information';
-                break;
-            case Urgency.CRITICAL:
-                stockIcon = 'dialog-error';
-                break;
+        case Urgency.LOW:
+        case Urgency.NORMAL:
+            stockIcon = 'dialog-information';
+            break;
+        case Urgency.CRITICAL:
+            stockIcon = 'dialog-error';
+            break;
         }
         return new Gio.ThemedIcon({ name: stockIcon });
     }
@@ -270,15 +270,15 @@ var FdoNotificationDaemon = class FdoNotificationDaemon {
                 delete this._notifications[ndata.id];
                 let notificationClosedReason;
                 switch (reason) {
-                    case MessageTray.NotificationDestroyedReason.EXPIRED:
-                        notificationClosedReason = NotificationClosedReason.EXPIRED;
-                        break;
-                    case MessageTray.NotificationDestroyedReason.DISMISSED:
-                        notificationClosedReason = NotificationClosedReason.DISMISSED;
-                        break;
-                    case MessageTray.NotificationDestroyedReason.SOURCE_CLOSED:
-                        notificationClosedReason = NotificationClosedReason.APP_CLOSED;
-                        break;
+                case MessageTray.NotificationDestroyedReason.EXPIRED:
+                    notificationClosedReason = NotificationClosedReason.EXPIRED;
+                    break;
+                case MessageTray.NotificationDestroyedReason.DISMISSED:
+                    notificationClosedReason = NotificationClosedReason.DISMISSED;
+                    break;
+                case MessageTray.NotificationDestroyedReason.SOURCE_CLOSED:
+                    notificationClosedReason = NotificationClosedReason.APP_CLOSED;
+                    break;
                 }
                 this._emitNotificationClosed(ndata.id, notificationClosedReason);
             });
@@ -330,15 +330,15 @@ var FdoNotificationDaemon = class FdoNotificationDaemon {
         }
 
         switch (hints.urgency) {
-            case Urgency.LOW:
-                notification.setUrgency(MessageTray.Urgency.LOW);
-                break;
-            case Urgency.NORMAL:
-                notification.setUrgency(MessageTray.Urgency.NORMAL);
-                break;
-            case Urgency.CRITICAL:
-                notification.setUrgency(MessageTray.Urgency.CRITICAL);
-                break;
+        case Urgency.LOW:
+            notification.setUrgency(MessageTray.Urgency.LOW);
+            break;
+        case Urgency.NORMAL:
+            notification.setUrgency(MessageTray.Urgency.NORMAL);
+            break;
+        case Urgency.CRITICAL:
+            notification.setUrgency(MessageTray.Urgency.CRITICAL);
+            break;
         }
         notification.setResident(!!hints.resident);
         // 'transient' is a reserved keyword in JS, so we have to retrieve the value
index cede9633c8d66c6bebab3ddb2818183234ce4532..1d3be68ba6e08a6f4f8fd15e161ccf8b4c28a640 100644 (file)
@@ -28,18 +28,18 @@ function isPopupMenuItemVisible(child) {
 function arrowIcon(side) {
     let iconName;
     switch (side) {
-        case St.Side.TOP:
-            iconName = 'pan-up-symbolic';
-            break;
-        case St.Side.RIGHT:
-            iconName = 'pan-end-symbolic';
-            break;
-        case St.Side.BOTTOM:
-            iconName = 'pan-down-symbolic';
-            break;
-        case St.Side.LEFT:
-            iconName = 'pan-start-symbolic';
-            break;
+    case St.Side.TOP:
+        iconName = 'pan-up-symbolic';
+        break;
+    case St.Side.RIGHT:
+        iconName = 'pan-end-symbolic';
+        break;
+    case St.Side.BOTTOM:
+        iconName = 'pan-down-symbolic';
+        break;
+    case St.Side.LEFT:
+        iconName = 'pan-start-symbolic';
+        break;
     }
 
     let arrow = new St.Icon({ style_class: 'popup-menu-arrow',
@@ -815,18 +815,18 @@ var PopupMenu = class extends PopupMenuBase {
 
         let navKey;
         switch (this._boxPointer.arrowSide) {
-            case St.Side.TOP:
-                navKey = Clutter.KEY_Down;
-                break;
-            case St.Side.BOTTOM:
-                navKey = Clutter.KEY_Up;
-                break;
-            case St.Side.LEFT:
-                navKey = Clutter.KEY_Right;
-                break;
-            case St.Side.RIGHT:
-                navKey = Clutter.KEY_Left;
-                break;
+        case St.Side.TOP:
+            navKey = Clutter.KEY_Down;
+            break;
+        case St.Side.BOTTOM:
+            navKey = Clutter.KEY_Up;
+            break;
+        case St.Side.LEFT:
+            navKey = Clutter.KEY_Right;
+            break;
+        case St.Side.RIGHT:
+            navKey = Clutter.KEY_Left;
+            break;
         }
 
         let state = event.get_state();
index f81cedaf99a1d942659259aa84f8525e525f7f9b..05c830c090bdea329e81c13c93f6f8e6cdb85cec 100644 (file)
@@ -1559,29 +1559,29 @@ var DeviceCategory = class extends PopupMenu.PopupMenuSection {
 
     _getSummaryIcon() {
         switch (this._category) {
-            case NMConnectionCategory.WIRED:
-                return 'network-wired-symbolic';
-            case NMConnectionCategory.WIRELESS:
-            case NMConnectionCategory.WWAN:
-                return 'network-wireless-symbolic';
+        case NMConnectionCategory.WIRED:
+            return 'network-wired-symbolic';
+        case NMConnectionCategory.WIRELESS:
+        case NMConnectionCategory.WWAN:
+            return 'network-wireless-symbolic';
         }
         return '';
     }
 
     _getSummaryLabel(nDevices) {
         switch (this._category) {
-            case NMConnectionCategory.WIRED:
-                return ngettext("%s Wired Connection",
-                                "%s Wired Connections",
-                                nDevices).format(nDevices);
-            case NMConnectionCategory.WIRELESS:
-                return ngettext("%s Wi-Fi Connection",
-                                "%s Wi-Fi Connections",
-                                nDevices).format(nDevices);
-            case NMConnectionCategory.WWAN:
-                return ngettext("%s Modem Connection",
-                                "%s Modem Connections",
-                                nDevices).format(nDevices);
+        case NMConnectionCategory.WIRED:
+            return ngettext("%s Wired Connection",
+                            "%s Wired Connections",
+                            nDevices).format(nDevices);
+        case NMConnectionCategory.WIRELESS:
+            return ngettext("%s Wi-Fi Connection",
+                            "%s Wi-Fi Connections",
+                            nDevices).format(nDevices);
+        case NMConnectionCategory.WWAN:
+            return ngettext("%s Modem Connection",
+                            "%s Modem Connections",
+                            nDevices).format(nDevices);
         }
         return '';
     }
index 2ab7f6add308880b5c130df42c567bf82297f1a1..f74cad125430b0a92305b606ea17b4385a20df06 100644 (file)
@@ -2080,27 +2080,27 @@ var WindowManager = class {
     _startSwitcher(display, window, binding) {
         let constructor = null;
         switch (binding.get_name()) {
-            case 'switch-applications':
-            case 'switch-applications-backward':
-            case 'switch-group':
-            case 'switch-group-backward':
-                constructor = AltTab.AppSwitcherPopup;
-                break;
-            case 'switch-windows':
-            case 'switch-windows-backward':
-                constructor = AltTab.WindowSwitcherPopup;
-                break;
-            case 'cycle-windows':
-            case 'cycle-windows-backward':
-                constructor = AltTab.WindowCyclerPopup;
-                break;
-            case 'cycle-group':
-            case 'cycle-group-backward':
-                constructor = AltTab.GroupCyclerPopup;
-                break;
-            case 'switch-monitor':
-                constructor = SwitchMonitor.SwitchMonitorPopup;
-                break;
+        case 'switch-applications':
+        case 'switch-applications-backward':
+        case 'switch-group':
+        case 'switch-group-backward':
+            constructor = AltTab.AppSwitcherPopup;
+            break;
+        case 'switch-windows':
+        case 'switch-windows-backward':
+            constructor = AltTab.WindowSwitcherPopup;
+            break;
+        case 'cycle-windows':
+        case 'cycle-windows-backward':
+            constructor = AltTab.WindowCyclerPopup;
+            break;
+        case 'cycle-group':
+        case 'cycle-group-backward':
+            constructor = AltTab.GroupCyclerPopup;
+            break;
+        case 'switch-monitor':
+            constructor = SwitchMonitor.SwitchMonitorPopup;
+            break;
         }
 
         if (!constructor)